Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 3 Aug 2010 22:49:16 +0000 (22:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 3 Aug 2010 22:49:16 +0000 (22:49 +0000)

Trivial merge